fixed issues after reverting...