Tried to fix #1, let's see how it works.