Fixes # 31