Fixing up potential hole