Should fix #2 + maybe fixes #1