Test fix
Merge branch 'master' of https://github.com/KDGDev/jmfb-patches