#1051 fix