Fixed properly #54