fixed issue 250 + 251