Solves #457