fixed to make it work with squeeze