Fix #4 again