bug fixes
fixing weird bug