Quick fix to get things working again