stage bug fixing