A better way of resolving the problem I hope.