A better fix #398