Attempted fix re: #593
Changelog re #593, fixes #593