Fix for issue #48 by @ShanaTsunTsunLove.