Fix #26 and #27