Fix for signal start + query (tx Fred)