1.39 updates

Fix by Bart