fixed for issue #14