more bug fixing in FAST