Working fix
production
Maybe this helps