#40 fix for SanDIego Vista