Properly fixes #14