Thanks for the fixes! Could you add tests just to be safe for future?