Fixes old API