This fixes #3 even more