fix for ECLIPSE-1053