bugfix take 3