fix for back and forth