fix for errors in previous commit