Wow, such fixes, much better