Makes Aaron happy (fixes #1)