Potentional partly fix