Temporary patch for code sanity tests