Fixed for Clip0.5.2