fix #59 Fixing issues on Bikester Trademark