temporily fixed the general convertion, waiting for a better method