issue 21 definetely fixed