Fixing attempt 1