Fixed issue with elements never found