Fxied #606