fixed some issues with FM