bugfixes for thumb