hot fix -508