temp fix until 5.0 upgrade