Fix #252 on master