bug fixes, buggy for the moment (test)