Updated to fix small issue