Improved handling of certain cases.
Improved handling of certain cases.

zammad/zammad,zammad/zammad,monotek/zammad,zammad/zammad,zammad/zammad,zammad/zammad,monotek/zammad,monotek/zammad,zammad/zammad,monotek/zammad,monotek/zammad,monotek/zammad