Solved problem (fingers crossed)