fixed - tested okay