More implementation for issue #46