Fixes #163 in the proper way