Fixing attempt 2