fixed issues 39 and 40