I know this is already merged... But, doesn't exist a more elegant solution to this issue?