Fixed bug affecting non-PCs