Fixed things #2