Bugfixes Ticket #22