temporary fix for issue no 2