Fixed os filtering