Fix double OF