Fixed issue 60, again