Properly fixes #4 . ;)