Temporary "fix" for #6