Fix nasty bug in production