Bugfix progressive enhancement