Bug fix for Fx