It kinda works again... still fails on trailing whitespace.