fixes ECLIPSE-1073
fixes ECLIPSE-1074