Fixed Callback Controller to redirect to the right place