quick-fix with a different approach