Fix anoying problem