fixes via @greyson