#263 Staff Edit Fix