Merge pull request #178 from GTechAlpha/rp_fix_sw_fb