Fixes 20141216