Issue 1010 fix