Temporary fix of thumbs. Implementation should be changed later on