Fix #6 again