[#252] Fixed