fixed issues with previous version