Fix #131 properly