Fix according to #60