Fix for issues #43, #44 and #45