Fixing issue 12

passed integration tests  fixes issue 12