#93, added a tested method