Fix blocking calls from super()