Fix #3 again