fixed the errors for linux
merged