[#307] Fixed