Quick fix for my current project