small fix for apply and singleton