Fixes # 1