RFPL-3368-fixed