Changed const and added something that might prevent weird stuff from happening