Fixing unexpected behavior on dev instance