fixed initialization of handler set
@Steven: you should please test your changes better...