rollback WORKSFORME bug fixing