should work properly with hybrid code now