Fixes #236.