#437, fixes these errors