Temporary fix to counter #384