this bugfix deals with the issues from !23 (merged) specified in tickets #27 (closed) and #26 (closed)