#632 Fix wierd button by Irshad