temp fix for "INVALID_STATE_ERR"