Booyah fixes #36