Fixed issue with default figure not being set