#1035 fix