fixes#1 Almostly