File open fix, small design change