Fix #106 elvis bug