Make compatible with dynamically scaled leap-data