fixed conversion!