yeah:( I will remove the refactor patch and create a new PR for it :)