Cleaning up the hole that Waylon made the other day...