Fix #137, fix #136