Trying to fix issue 253 (no tests)