bug fixes, workaround for CREA bug