Fixing the constructor, i guess