Impementation for issue #11