Better alternative for latest bugfix.