Fix for Ticket #113

Merging branches was somehow spoiled; had to fix manually