this fixes #3 ok?