fixed bug, test all other methods