added short workaround to assertion issue