fixed version 2/7