step 5: bugfix