fixed previous issue