Fix for issues #157, #158 and #164