fixes ECLIPSE-1032