Beautiful fix for the problem :D