Trying to fix things #4