Fix #197, again