Try to workaround #102