STEP4: bugfix2