Sending a new patch, this will apply cleaner and has an actually good commit
message :-) 
Thanks!