#608 temporary fix