Fixes #537
rebased onto c6d9d74c99eee8a06d39d50072e35efed01b41d4
rebased onto 5f6e97da8206891906bc14c7a18ed742b2192915
Pull-Request has been merged by pbokoc
Fixes #537