Fix of the freespace handler