dirty fix to avoid problems