Fixed isbug with pin buttons