Resurrection of #398 #lego