fixes #48 finished