#583 - removes .substring(1)
from handler names
#584
Merged
.substring(1)
from handler names
#584