fixed big #54