[#436] Fixed

@Lynngre please check