Bug fix with controller filter