bug fixing in FAST