fixed previous problems