FWP bug - solved