fix some issues with previous version