Preemptive bugfix - expected datatypes