Thanks @aarondav I'll update the patch accroding to your review