Fixes problems caused by dec51d631774638e36e118808b5e9a89a8e95a83.

Should fix #288, caused by #286