fixed bugs from last commit for linux