Fixed properly