Fixed bugg