Since we already do this, lets keep doing it until we fix issue #56