fixes#7, fixes#8