Tried adding in @tpaksu's framework.php changes.