System logic: Fix nasty bug