[gayswami+issue+7+fix]