Bug based on OS solved