fixed #HOT-2