Fix #506 (potentially)