Fixed 2.5 min warning and double switch

#120