Continuation of the last fix..