Hot fix for correct work