rehabilitating - currently works in 'production' env but not 'development' nor 'test'