Issue 476 fix