KITTEH! fixes #415