Finally fixed previous two commits