fix for working version