Fixed bug in button mixin