fixes ECLIPSE-1015