Fix #412 in master