Add support for real OS (: