Fixed #154 (again)