Yay for fixing small tricky bugs!