Fixed on staging, commit cded3a759356ff66b7df668bcdbdfa0daf96f4c5.