Fix #408 for good