this fixes #1 apparently...

#1 was fixed.