fix for working