Inspired by #67, an update to the original fix, fixes #56