fixes ECLIPSE-956