140404 fix issues 2 and 3