fix for ECLIPSE-1055 and ECLIPSE-1059