Should resolve the issue