last fix, hopefully #3