Fixinbg bugs