Fixed handling of single spot