Fixes #1164