Jemma's bug fixing.