Fix #312 improve disabled behavior