Fix an error – result of solving issue #58