Trying to fix things #2