Fix #427

Require tests for this?