last fix, hopefully #8