Fix #317: Take II