Flow is now properly defined by build type fixing #149 and #143