Fixed #121 and change flashes