Quick fix to work