Fix for withbuttoncallback #46