Revert "Revert "throwing stars fix""

This reverts commit f000df87e76db0fd29d05875bbb37f601bd6cb80.