Fix #411 for master