* Fix button back behaviour 2, close #29