Ugly, but still fixes #14