Fixing previous issues