Fix for backwards compatibility