correct if error
commit by ubuntuhome
merging