fixes #544 for @shaneholloman