Fix #51