Fix instead of band aid