Fix for issues #16 and #24