Ok more fixed