Ported bugfix