#4 + fix #3