Implementation for issue #10