fixed bug introduced with last commit.. I don't know if this is desirable, or should roll back