Fixed bug and changed rate for listener