Fixed issue # 13