Tidying up last bit and fixing issue 3024

Signed-off-by: Naomi Novik <shalott@gmail.com>