@elmer-garduno and @amaiberg fixed bugs