Fixed bug with special targets