Fixes #918 more