Fix #1 again