#71 Fix condition