Fixing previous commits