Trying to fix ugly bugg...