Fix #176 for real