moved temporary star-fix to client side temporary star-fix