Adding my final touch to a gross quickfix