Fix #3 in previous commit