fixing problems introduced with previous commit