Nice catch, fixed & rebased once again ontop of master