fixed volatile/non-volatile issue (for now...)