here i fixes #3 and perhaps fixes #1 ?