Fixed small compatability issue due to an errornous assumption