Fixes Timing Problem with API Interface