bugfix take 2