Fixed condition
ready for linux