Applied workaround from ECLIPSE-376