[Reviewer: Ellie] Iss458

Fixes #458