hack fix for backwards compatibility