fixed previous commits