workaround for UDIG-1974 - thsi should be changed once the bug is fixed