attempting to bugfix stuff (not working)