fixed message return from buttons