Implementing issue #41 on client