Fixed commit bugs from previous commit