Fixes issues #573 and #574