Fix for lemonstand compatibility