Fix for Timeline bug related to new Java version