Fixed to continue conversation closes #24