fix for scrunitizer reported bugs