Now that's a proper fix to #7.