Fixed production bug