Adding some fixing