intermediary update of suanyuan's scaling fix