Fix for old jank code