fixed bugg