removed optimization that made things slower