Trying to fix #54.