Fixing according to suggestions