Fix for auto-fill-mode user(#241)

@tigerhawkvok Is this OK ?