Fixed #27, again ...