[bowen] fix @singleton issues