Prevent a corner case and add static keywords