fixed issues with previous commit