It's probably safer to keep it the current way, the way it is supposed to be implemented